Oops, return if the unmap test fails. (test_reload_sequence): Use

2005-09-28  Federico Mena Quintero  <federico@ximian.com>

	* tests/autotestfilechooser.c (test_reload_sequence): Oops, return
	if the unmap test fails.
	(test_reload_sequence): Use gtk_widget_show_now() instead of
	gtk_widget_show() for the dialog.
	Thanks to Tim Janik for noticing these.

diff --git a/ChangeLog b/ChangeLog
index bef2a58412c0e90207437c0e161a552bb5ea0035..84e0de75e0533c8217d948d58619e446f4abf1a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-28  Federico Mena Quintero  <federico@ximian.com>
+
+       * tests/autotestfilechooser.c (test_reload_sequence): Oops, return
+       if the unmap test fails.
+       (test_reload_sequence): Use gtk_widget_show_now() instead of
+       gtk_widget_show() for the dialog.
+       Thanks to Tim Janik for noticing these.
+
 2005-09-28  Federico Mena Quintero  <federico@ximian.com>
 
        * tests/testcellrenderertext.c: New file with a set of tests for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bef2a58412c0e90207437c0e161a552bb5ea0035..84e0de75e0533c8217d948d58619e446f4abf1a2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-09-28  Federico Mena Quintero  <federico@ximian.com>
+
+       * tests/autotestfilechooser.c (test_reload_sequence): Oops, return
+       if the unmap test fails.
+       (test_reload_sequence): Use gtk_widget_show_now() instead of
+       gtk_widget_show() for the dialog.
+       Thanks to Tim Janik for noticing these.
+
 2005-09-28  Federico Mena Quintero  <federico@ximian.com>
 
        * tests/testcellrenderertext.c: New file with a set of tests for

diff --git a/tests/autotestfilechooser.c b/tests/autotestfilechooser.c
index 10f26c591f5ca7a1fcf499444ac6733a6acfeabf..7597bf52a5f8c45e39e83369815407bf6f933eca 100644 (file)
--- a/tests/autotestfilechooser.c
+++ b/tests/autotestfilechooser.c
@@ -257,7 +257,7 @@ test_action_widgets (void)
                                        GTK_STOCK_OK,
                                        GTK_RESPONSE_ACCEPT,
                                        NULL);
-  gtk_widget_show (dialog);
+  gtk_widget_show_now (dialog);
 
   action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog));
 
@@ -322,7 +322,7 @@ test_reload_sequence (gboolean set_folder_before_map)
 
   /* After mapping, it is loading some folder, either the one that was explicitly set or the default one */
 
-  gtk_widget_show (dialog);
+  gtk_widget_show_now (dialog);
 
   passed = (impl->current_folder != NULL
            && impl->browse_files_model != NULL
@@ -347,10 +347,12 @@ test_reload_sequence (gboolean set_folder_before_map)
            && ((impl->load_state == LOAD_LOADING || impl->load_state == LOAD_FINISHED)
                ? (impl->load_timeout_id == 0 && impl->sort_model != NULL)
                : TRUE));
+  if (!passed)
+    return FALSE;
 
   /* Map it again! */
 
-  gtk_widget_show (dialog);
+  gtk_widget_show_now (dialog);
   
   passed = (impl->current_folder != NULL
            && impl->browse_files_model != NULL